auto merge of #735 : tomaka/cargo/platform-specific-deps, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
cc #610

1  2 
src/cargo/ops/cargo_rustc/fingerprint.rs
tests/test_cargo_compile.rs

Simple merge